merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 22 Sep 2010 06:46:51 +0000 (15:46 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 22 Sep 2010 06:46:51 +0000 (15:46 +0900)

Trivial merge